Sync'd branch integration/fx-team with upstream @ Thu Oct 16 10:06:44 PDT 2014