Sync'd branch integration/fx-team with upstream @ Thu Oct 30 13:18:59 PDT 2014