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