Backport 48ca451 changes to 2.0 release.

Signed-off-by: crynobone <crynobone@gmail.com>