Sync'd branch integration/fx-team with upstream @ Thu Oct 16 18:31:40 PDT 2014