Pull in changes from Bitly master