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