Merge origin/master

Conflicts:
	src/java/bi/hd_message.java