try #2 at the merge for 0.10.0
david_view-improvements 207:HEAD
v-dogg 267:HEAD
also update version.php