Refactor self
#3329

7877014
segayuu wants to merge segayuu:Refactor-self into hexojs:master

We do not currently have an analysis of these two commits