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