Sync'd branch integration/fx-team with upstream @ Thu Oct  2 00:12:43 PDT 2014