merging master into "gh-pages" branch

Demo page should now use most recent code, so there should be fewer reports of broken features "visible on the demo page" that have already been fixed.