feedback (bug master)
Merge branch 'master' into gh-pages