updated to 1.8.4.rc0
updated to 1.8.4.rc1
updated to 1.8.4.rc4
updated to 1.8.4
Merge changes leading to 1.8.4