Sync'd branch integration/fx-team with upstream @ Thu Oct 30 15:55:51 PDT 2014