master-bc-599

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