Merge current master into develop

@starwed mentioned in #433 that master is some commits ahead of develop. Why don't we just merge the stuff into develop?