Sync'd branch integration/fx-team with upstream @ Thu Oct 23 20:17:44 PDT 2014