master-bc-491

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