Sync'd branch integration/fx-team with upstream @ Mon Oct 27 14:01:09 PDT 2014