master-bc-629

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