some thoughts in comments
Merge branch 'master' into comment-questions