Merge pull request #3527 from sartura/deboostrap-bump