Merge remote-tracking branch 'origin/master'
authorMikko Rasa <tdb@tdb.fi>
Mon, 19 Sep 2016 14:00:06 +0000 (17:00 +0300)
committerMikko Rasa <tdb@tdb.fi>
Mon, 19 Sep 2016 14:00:06 +0000 (17:00 +0300)

Trivial merge