Merge remote-tracking branch 'alexandre/nitdoc-qs'