master-bc-423

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