2.1.15b4
Some correction based on open tickets.