Merge branch 'master' into gh-pages
Disable Q stacktrace support
Upgrade collections package to 0.1.17