Sync'd branch integration/fx-team with upstream @ Thu Oct 23 12:39:46 PDT 2014