Allow selecting custom WSDL options
More fixes for namespace support
Merge remote-tracking branch 'origin/master'