Merging recent changes from rzwitserloot/lombok into my fork.

Merging recent changes from rzwitserloot/lombok into my fork.