master-bc-607

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