master-bc-393

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