Merge master into feature/cray-energy