prevent 'contentview not yet created' error
Merge branch 'master' of github.com:TeleportR/foo