backport eea3c21aa139095d6d5ca54befade6fdf392f50d (Mar 07, 2014)
backport b168ac1d84361f39cb2dc81e79dd66dc638e6ba1 (Mar 12, 2014)