Sync'd branch integration/fx-team with upstream @ Thu Sep 18 20:03:41 PDT 2014