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