Merge changes from anneliesleysen into master

Earl Bingham authored
revision b9787b3044dc7cfccfda3a231c96dedfaaa7112e