master-bc-356

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