Sync'd branch integration/fx-team with upstream @ Mon Oct 20 13:35:06 PDT 2014