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