Sync'd branch integration/fx-team with upstream @ Sun Aug 31 09:19:34 PDT 2014