master-bc-440

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