Updates for 2014-06-23 Centro prez
Merge branch 'master' into gh-pages
merge master