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