Clone
Martin Stockhammer
committed
on 19 May 18
Preparing for JDK>=9 compatibility
master + 6 more