fixed version number to reflect previous merge and fixed a missing bugfix I...
fixed version number to reflect previous merge and fixed a missing bugfix I wasn't able to merge before
fixed version number to reflect previous merge and fixed a missing bugfix I wasn't able to merge before