Merge branch 'gh-544' into decoupling-with-pending-fixes

Conflicts:
js/boot.js