Sync'd branch integration/fx-team with upstream @ Thu Oct 23 11:09:20 PDT 2014