Bump to 3.0.2 with backport of #487

Closes #486