sync latest master at 2014-08-10