master-bc-697

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