master-bc-448

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