Merge branch 'master' into common-types
authorRobert Bradshaw <robertwb@gmail.com>
Tue, 13 Aug 2013 05:56:59 +0000 (22:56 -0700)
committerRobert Bradshaw <robertwb@gmail.com>
Tue, 13 Aug 2013 05:56:59 +0000 (22:56 -0700)

Trivial merge