Bug 928701
Merge pull request #2076 from bdecoste/master

Merged by openshift-bot