tree fe75a0b308a8127d79a9283fc2b74a97794e921e
parent 8da55edb572165ccf524007ab3787722ad871cc8
author Lukas Jungmann <lukas.jungmann@oracle.com> 1538861303 +0200
committer Dmitry Kornilov <maiden168@gmail.com> 1538861303 +0300

Sync changes from original repo and master (#120)

Signed-off-by: Lukas Jungmann <lukas.jungmann@oracle.com>