json: comment '* text=auto' in .gitattributes
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Fix authentication filter: use {HTTP_AUTHORIZATION}.is_basic