master-bc-502

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