Build 0.9.13.1 based on working master