Sync'd branch integration/fx-team with upstream @ Mon Oct 27 03:55:43 PDT 2014