Merge branch 'master', remote-tracking branch 'allegro/master'
docs fix