Windup 239

https://issues.jboss.org/browse/WINDUP-239