master-bc-346

http://issues.liferay.com/browse/LIFERAYQA-3965