PR for test fix Shiro Kawai 26 Jan 2016 10:11 UTC