master-bc-613

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