Sync'd branch integration/fx-team with upstream @ Thu Oct 16 00:13:49 PDT 2014