Merge remote-tracking branch 'origin/gh-pages'
Final tweaking of feature matrix code
Merge remote-tracking branch 'origin/master'