Merge branch 'release/R20160627' into develop
Merge branch 'master' into develop
String was too short for the date.
Renamed kippie to klippie