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