Merge branch 'master' into gh-pages
<base target='_blank' />