master-bc-597

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