Sync'd branch integration/fx-team with upstream @ Thu Sep 25 00:55:43 PDT 2014