TRUNK-257 - merge with upstream/master