Merge remote-tracking branch 'rtime/master'
authorPavel Pisa <ppisa@pikron.com>
Sat, 27 Aug 2016 08:39:30 +0000 (10:39 +0200)
committerPavel Pisa <ppisa@pikron.com>
Sat, 27 Aug 2016 08:39:30 +0000 (10:39 +0200)

Trivial merge