Merge branch 'STORM-3384-1.1.x' of https://github.com/Ethanlm/storm into asfgit-1.1.x-branch