Sync'd branch integration/fx-team with upstream @ Wed Oct 29 14:02:40 PDT 2014