Optimizebot.
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Reverting these things, whitespace, and a few other things...