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