master-bc-537

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