Merge changes from 20130710 update.
Kill feed spacing fix.
My preferred crosshair