Sync'd branch integration/fx-team with upstream @ Thu Oct 23 21:08:43 PDT 2014