master-bc-774

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