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