Merge branch 'master' of https://github.com/pitikov/alpsite2
bugfix