master-bc-617

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