Merge branch 'master' into 4486-document-arv
authorWard Vandewege <ward@curoverse.com>
Wed, 12 Nov 2014 01:34:04 +0000 (20:34 -0500)
committerWard Vandewege <ward@curoverse.com>
Wed, 12 Nov 2014 01:34:04 +0000 (20:34 -0500)
refs #4486


Trivial merge