Updated source from octoshrimpy/SIP
Merge remote-tracking branch 'origin/master'