Sync'd branch integration/fx-team with upstream @ Thu Oct 30 14:17:48 PDT 2014