Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Swap color range and support for background images
Merge branch 'gh-pages'