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