Merge pull request #3254 from seanchannel/develop

are we there yet?