proxygen alignment ftw.
Merge pull request #756 from Gravecorp/3.1.x.x

proxygen alignment ftw.