Merge changes from master back to develop

A few commits were placed on the master branch, that should have gone to develop as well. Merging them back...