Merge remote-tracking branch 'origin/master'
[nmbug-tags.git] / tags / 7d3e24291b8d4cc0d11b1a87249bbebed4e78648.1411379395.git.jani@nikula.org / pushed