Sync'd branch integration/fx-team with upstream @ Wed Oct 15 06:25:43 PDT 2014