Sync'd branch integration/fx-team with upstream @ Thu Oct 16 00:58:42 PDT 2014