Fixes lates history bug from proto-clashers.
Merge branch 'dev' into gh-pages