master-bc-514

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