Merging master into develop.

Adds four previous merges.