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