20140520 build 6.0 003 (RC)

Merging into 2.3.0-release-candidates for BHV-3607