master-bc-411

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