Working on https://bugzilla.redhat.com/show_bug.cgi?id=1090748
Merge branch 'devel' into Cluster