6.3
[Code Cleanup] 6.3 compatibility
0.5.15
Merge remote-tracking branch 'wgm/6.3' into 6.3