Sync 'develop' with 'master', whoops.

Kind of failed on the Git Flow here.