Sync'd branch integration/fx-team with upstream @ Thu Oct 30 06:28:36 PDT 2014