Merge: rev791 (Use comboloader on ubuntuone branded index)