Sync'd branch integration/fx-team with upstream @ Mon Oct 20 09:58:54 PDT 2014