[bodhi] Branch 'pyramid' - 4 commits - pyramid/bodhi