master-bc-496

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