Merge commit '5ce20fc5d56a32584f8a2d18ae7cde91eb12a5a4' into taskChanges
authorAnže Videnič <anze.videnic@gmail.com>
Mon, 4 Jul 2016 14:23:47 +0000 (16:23 +0200)
committerAnže Videnič <anze.videnic@gmail.com>
Mon, 4 Jul 2016 14:23:47 +0000 (16:23 +0200)

Trivial merge