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