Sync'd branch integration/fx-team with upstream @ Thu Oct 30 03:11:40 PDT 2014