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