master-bc-404

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