Sync'd branch integration/fx-team with upstream @ Thu Sep 18 14:48:40 PDT 2014