Update to latest dev-branch changes as of 22/04/2014