Working on https://bugzilla.redhat.com/show_bug.cgi?id=1097981
Merge remote-tracking branch 'origin/devel' into devel