master-bc-507

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