master-bc-500

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