Pull release 0.8.4 into Master