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