Should fix a bug where code does not compile in Java6
Merge remote-tracking branch 'origin/dev' into dev