master-bc-767

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