Merge branch 'hotfix/2.5.4'
Bug #88 : fixed CS6 API Disk render crash due to not keeping reference to BlueCallbackWrapper around and premature garbage collection
Merge branch 'hotfix/2.5.5' into develop