Edx west/merge gugelhupf

Note: NOT to master

@jrbl @sefk just merging the changes from the recent release back in