Merge branch 'STORM-2000' of github.com:satishd/storm