master-bc-698

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