Sync'd branch integration/fx-team with upstream @ Wed Sep 17 12:13:40 PDT 2014