Use ffonly supported gradlecm plugin
Minor javadoc change for timer
Merge remote-tracking branch 'origin/master' into release