master-bc-489

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