master-bc-813

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