Changes for 2015 05 release