Sync'd branch integration/fx-team with upstream @ Thu Oct  9 17:14:45 PDT 2014