updated version
Merge pull request #84 from lynnaloo/master

updated version
Merge pull request #85 from xtuple/tags/R1_6_0

Tags/r1 6 0