Merge branch 'issue799' into develop. Issue #799.

This commit is contained in:
Davide P. Cervone 2014-04-25 09:12:13 -04:00
commit bf9f704e20

File diff suppressed because one or more lines are too long