Applies Jason Dyer's Apache 2.0 diff from http://dev.wavemaker.com/forums/?q=node/8046#comment-35557