master-bc-513

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