Merge branch 'official'
authorRobert Treat <rob@xzilla.net>
Sat, 18 May 2013 22:15:06 +0000 (18:15 -0400)
committerRobert Treat <rob@xzilla.net>
Sat, 18 May 2013 22:15:06 +0000 (18:15 -0400)

Trivial merge