Merge branch 'STORM-2937' of https://github.com/erikdw/storm into STORM-2937-1.0.x-merge