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