FELIX-927 Apply patch by Alin Dreghiciu to allow for better bind/unbind method signatures (thanks for the patch)