master-bc-769

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