Sync'd branch integration/fx-team with upstream @ Wed Oct 22 18:57:45 PDT 2014