Merging from master to dev

Hopefully for the last time!