Sync'd branch integration/fx-team with upstream @ Thu Oct 23 05:27:04 PDT 2014