Update 0.6.1 of ZAM
Merge remote-tracking branch 'upstream/master'