Merge with lejos 0.4+ (master)