Merged in testing from 2013-04-egi-forum