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