Updated to current Merchello development (not released) version 1.2.12