v1.1.5: merging in hotfix1.