commit 30052013 (GMT+8)