master-bc-444

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