Merge branch 'ganymedes01-master
Closes #1345