master-bc-413

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