20140530 build 6.0 004 RC

Merging for BHV-9257 and BHV-9248