[mondrian-1216,1252] merge fixes for mondrian-1201,1252 from master
Merge pull request #75 from tgf/lagunitas1252

[mondrian-1216,1252] merge fixes for mondrian-1201,1252 from master