master-bc-405

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