Merge branch 'master' into marty
Merge branch 'master' into marty
Fixed crash when generating estimate with blank fields
Merge branch 'marty'