Bring develop inline with fixes from 2014.7

@whiteinge please review