[Simexplorer-si-commits] r6 - trunk