Sync from 2014.05

This updates the daisy branch with all the fixes from the release/2014.05 branch since it split.

I have build tested this on numerous platforms and boot tested it on the Bald Eagle