Merge branch 'release/1.3'
[reservoir_sample] / test /
2013-02-26 Justin WindMerge branch 'release/1.3' master
2013-02-26 Justin WindGeneral cleanups, and argument validations.