Merge master

Merging master into test branch so that the test is up to date.