master-bc-749

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