Merge branch 'skip-args'
authorWard Vandewege <ward@curoverse.com>
Tue, 19 Aug 2014 14:22:58 +0000 (10:22 -0400)
committerWard Vandewege <ward@curoverse.com>
Tue, 19 Aug 2014 14:22:58 +0000 (10:22 -0400)
no issue #


Trivial merge