Merge "Add build numbers next to crespo version numbers"