first commit
First merge of master
Merge branch 'master' into gh-pages
from gh-pages branch, committed new merge of master into gh-pages