Sync'd branch integration/fx-team with upstream @ Wed Oct 15 18:49:42 PDT 2014