Sync'd branch integration/fx-team with upstream @ Mon Oct  6 21:08:42 PDT 2014