Sync'd branch integration/fx-team with upstream @ Sun Sep 28 09:12:43 PDT 2014