tree cccfae98d8ac252f64af12cb0b34b48e095e2de6
parent 8d884e3d31728303b2ee59d24a9bb1760076f5b5
author Martin Vojtek <martin.vojtek@oracle.com> 1427201748 +0100
committer Martin Vojtek <martin.vojtek@oracle.com> 1427227763 +0100

Back port of Bugs #418486 and #440360.

Signed-off-by: Martin Vojtek <martin.vojtek@oracle.com>