[RJ-GD] Merged updates from JavaGD-0.6.1

Signed-off-by: Stephan Wahlbrink <sw@wahlbrink.eu>