master-bc-625

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