406178e
Merge branch 'master' into develop * master: fix namespace, add error checking Signed-off-by: Adam Miller <maxamillion@fedoraproject.org>