Merge branch 'pleroma-result-1_13' into 'develop'