Sync'd branch integration/fx-team with upstream @ Mon Oct 13 09:28:44 PDT 2014