Fixed https://bugzilla.redhat.com/show_bug.cgi?id=980265
Merge remote-tracking branch 'origin/Development2' into Development2