Merge branch 'master' into gh-pages
Updated JS references
Merge branch 'master' into gh-pages
Resolving pullquote conflict
Resolving pullquote conflict