jb(s) 1st 2013 pull

Upgrade from '6.1.0 CE to 6.1.1 CE'/'6.1.0 CE to 6.1.20 EE' - Fails
when there are bookmarks