wtls branch merged

[Alexander Malysh]

Hi together,

just merged and commited wtls branch into trunk.
Please check it and let me know if something went wrong.

Thanks,
Alexander Malysh