master-bc-775

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