Sync'd branch integration/fx-team with upstream @ Wed Oct 29 10:41:37 PDT 2014