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