Sync'd branch integration/fx-team with upstream @ Wed Sep 24 03:19:41 PDT 2014