Merge 43 from jtalks-org:master

Merge changes from jtalks-org:master.