working around the Runnable <=> Closure regression in Groovy 2.2.0
Merge remote-tracking branch 'origin/master'