Merging 0.6.13.1 release into dev

Collapsing hotifx release branch from master into dev