Merge remote-tracking branch 'origin/master'
[nmbug-tags.git] / tags / 0fadf414bc7086c5abddc3cbdd2c9da5f286f6ad.1446579858.git.jani@nikula.org / patch