master-bc-631

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