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