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