master-bc-699

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