merged upstream master - Last commit: bcf7345 (2013-02-21 15:34:35 +0700)