master-bc-416

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