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