Merge from 3.3
authorAndrew Kuchling <amk@amk.ca>
Sun, 16 Feb 2014 16:15:13 +0000 (11:15 -0500)
committerAndrew Kuchling <amk@amk.ca>
Sun, 16 Feb 2014 16:15:13 +0000 (11:15 -0500)

Trivial merge