master-bc-414

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