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