Merge pull request #774 from sexnothing/develop

BS3 update
Merge remote-tracking branch 'upstream/develop' into develop