Sync'd branch integration/fx-team with upstream @ Thu Oct 23 18:07:45 PDT 2014