Changes from master

This is what changed in master.
Merge branch 'master' into test-branch