merge preferring 4.5.2
authorSteve Hackbarth <stephenhackbarth@gmail.com>
Mon, 14 Jul 2014 15:17:22 +0000 (11:17 -0400)
committerSteve Hackbarth <stephenhackbarth@gmail.com>
Mon, 14 Jul 2014 15:17:22 +0000 (11:17 -0400)

Trivial merge