Merge branch 'issue261' into devel

This commit is contained in:
John Evans 2014-09-16 10:45:21 -04:00
commit ebc05648eb

File diff suppressed because it is too large Load diff