5-29-14 merge

The merge that broke gearswap.