Merge remote-tracking branch 'origin/staging' into bootstrap
Merge branch 'bootstrap' of github.com:petercunning/memapp into bootstrap
bootstrap part 2