code folding Mon Jun  2 14:51:18 GMT 2014
Merge branch 'master' into gh-pages