master-bc-481

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