Merge branch 'master' into rorczrorcz
authorKyle J. McKay <mackyle@gmail.com>
Wed, 29 Apr 2015 13:52:44 +0000 (29 06:52 -0700)
committerKyle J. McKay <mackyle@gmail.com>
Wed, 29 Apr 2015 13:52:44 +0000 (29 06:52 -0700)

Trivial merge