master-bc-534

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