Modified to work in smorgasbord, see https://github.com/phetsims/smorgasbord/issues/1
Merge remote-tracking branch 'origin/smorgasbord'
reverted smorgasbord-related changes so that the smorgasbord merge will just keep the namespace changes