Merge remote-tracking branch 'origin/master'
[nmbug-tags.git] / tags / 1446573161-28068-1-git-send-email-sojkam1@fel.cvut.cz / moreinfo