be a bit more gentle on assembly loading
fix beta versioing
Merge remote-tracking branch 'upstream/master'