Fix feb2014 merge

This may need to get cleaned up and fixed as it looks like these branches and commits are a bit wonky.