Sync'd branch integration/fx-team with upstream @ Thu Oct 23 15:34:41 PDT 2014