Sync'd branch integration/fx-team with upstream @ Wed Sep 17 16:25:43 PDT 2014