Merged 'master'.
Merged 'develop' into unit-tests.