master-bc-688

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