Sync'd branch integration/fx-team with upstream @ Thu Oct 16 09:43:44 PDT 2014