Merge "Version bump to EM28.180606.017" into emu-2.8-release