Up merge from 4.0.5 to 4.1.x#631

Spomky merged 4 commits into4.1.xweb-token/jwt-framework:4.1.xfrom

temp-8e9fadweb-token/jwt-framework:temp-8e9fadCopy head branch name to clipboard