Squashed 'app/' changes from e3e0aae..ad6364f

ad6364f Fix a couple of schoolboy errors

git-subtree-dir: app
git-subtree-split: ad6364f196b31dd5ba70702b7165daefdd5b7d18
Merge commit 'f239588d2805e47bb98f2247daa6640d04074b06'