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