Merging in all changes from 'demo' svn branch.