Cherrymerge pull request from allanlw.