Merge branch 'master' into diagnostic
authorChristopher Peplin <chris.peplin@rhubarbtech.com>
Fri, 17 Jan 2014 20:05:27 +0000 (15:05 -0500)
committerChristopher Peplin <chris.peplin@rhubarbtech.com>
Fri, 17 Jan 2014 20:05:27 +0000 (15:05 -0500)

Trivial merge