Documentation included.
Backport note:
This backport includes change I2b31100c7a547f10ff9f445811c0bf4084fec3cd
which fixed several problems with the original change.
Resolves: rhbz#2136519
Signed-off-by: Jiri Podivin <jpodivin@redhat.com>
Change-Id: I4c1090f6d335509051c63f1a1788abd1606cfa4f
(cherry picked from commit 0e6c1b2650)
(cherry picked from commit 156bf5f696)