Merge branch 'master' into heroku
Merge branch 'master' into heroku
Merge branch 'master' into heroku
Merge branch 'master' into heroku
Merge branch 'master' into heroku
Merge branch 'master' into heroku
Performance tweaks, remove observe
Merge branch 'heroku'