Merged changes from master into contributions, hopefully last time