Merge branch 'master' into develop

@nnevala @mlopes 
Shall we make `develop` default branch as usual, so that will contain `release/*`, etc?

![img](http://31.media.tumblr.com/tumblr_mdij02T9b81rcwh5ro1_400.gif)