Upgrade to commits b55ab4e (14.08.2013)