Fixed https://github.com/t3framework/t3/issues/206
Merge branch 'master' of github.com:t3framework/t3