Sync'd branch integration/fx-team with upstream @ Thu Sep 18 10:42:37 PDT 2014