A few edits to post, see comments inline
Merge branch 'master' of github.com:rocker-org/rocker
Merge branch 'master' into sandbox