Merge branch 'master' of github.com:matthewrmshin/rose into 317.rose-suite-shutdown
Merge branch '317.rose-suite-shutdown' of github.com:matthewrmshin/rose into 317.rose-suite-shutdown