master-bc-425

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