Sync'd branch integration/fx-team with upstream @ Mon Oct 27 13:32:17 PDT 2014