Lets wrap up 3.1.4

[Leif Hedstrom]

We're so close, please close whatever bugs should be closed for 3.1.4, 
move out whatever should be moved out. We need to get this sucker out, 
so we can make a 3.2 release...

-- Leif