Devel

Pull request of 'devel' after 4th August 2014 to 'master'.