Revert "yet another branch first commit"

This reverts commit 5a07ee1ecd9558c884757fc13c67895df17eab13.
Merge branch 'master' into toms_new_feature