Merge remote-tracking branch 'origin/master'
[nmbug-tags.git] / tags / 1045e9574656c8a3389cfee1057c3a3e2cf0b555.1344065790.git.jani@nikula.org / patch