Sync'd branch integration/fx-team with upstream @ Thu Oct  9 22:47:44 PDT 2014