Merge branch 'master' into 20172
authorSteve Hackbarth <stephenhackbarth@gmail.com>
Fri, 26 Apr 2013 12:47:28 +0000 (08:47 -0400)
committerSteve Hackbarth <stephenhackbarth@gmail.com>
Fri, 26 Apr 2013 12:47:28 +0000 (08:47 -0400)

Trivial merge