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