master-bc-610

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