master-bc-677

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