Sync'd branch integration/fx-team with upstream @ Mon Oct 27 13:18:53 PDT 2014