Sync'd branch integration/fx-team with upstream @ Wed Oct  8 17:12:43 PDT 2014