Merge branch 'STORM-3381' of https://github.com/srdo/storm into asfgit-master