backport debe91a443008f33138080dc8fd5e9f1fc0884d1 (Mar 06, 2014)