Sync'd branch integration/fx-team with upstream @ Thu Oct  9 11:05:38 PDT 2014