v1.15.45.c.pre

resolving conflicts between master and branch...