Merge branch 'master' into gh-pages
pulled updates from @mdo/hyde