master-bc-503

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