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