Merge branch 'master' into 2076-check-config-at-boot
authorTom Clegg <tom@curoverse.com>
Mon, 10 Mar 2014 19:58:49 +0000 (15:58 -0400)
committerTom Clegg <tom@curoverse.com>
Mon, 10 Mar 2014 19:58:49 +0000 (15:58 -0400)

Trivial merge