This week on BBC Comedy...

Welcome to our weekly round of the week that was on BBC Comedy...

The Rapture may not have happened... but here's four signs of the forthcoming apocalypse in one all-singing, all-dancing sketch.

If the Glasgow heat teaches us anything, it's that the future of UK comedy is going to be really rather hirsute. So much facial hair.

Turn off those taps, turn off those lights, turn down those sheets. If we're not careful, this is the shape of things to come. And oh boy, what a shape....

Jo Brand and the staff of King Edward VIIIth hospital are back for a third series of the Getting On, the Bafta-winning bedpan-com.

Chris "Summer Heights High" Lilley is back with new series Angry Boys. We were kind of hoping it would involve throwing boys at structures created by spherical green pigs, but apparently we were mistaken.

It's the frickin' summer already. How did that happen? Anyway, to celebrate, here's a seasonal Family Guy Christmas song.

A clutch (yes, a clutch) of Two Pints outtakes to gently guide you into the weekend... "clutch."

How exactly did filmdirectorlegendman John Landis end up in Psychoville?

BBC Comedy hits the Edinburgh Festival Fringe 2011

Here's why 2011 is going to be a big, BIG year for BBC Comedy at the Edinburgh Festival Fringe...

BBC assemble!

This year at the Fringe all areas of the BBCwill combine their talents under one roof near Bristo Square from the 12th to the 27th of August to bring you the funny. Here's a snapshot of just some of the entertainment and comedy that will feature across this two week period.

Radio 4 will showcase a selection of its very best comedy programmes, including:

The Unbelievable Truth (chaired by David Mitchell), Just a Minute and recordings of Richard Herring's Objective, and Stephen K Amos's Life an Idiots Guide as well as Front Row, Loose Ends and much much more.

Radio 1 will be returning to Edinburgh. Scott Mills will broadcasting his show live from our pop up venue for a week from August 15th and Nick Grimshaw will be hosting some very special late night shows showcasing some of the best talent at the Fringe.

There's a twice-daily stand up show from BBC Comedy Presents at 5pm and 11pm which will feature the very best stand up, sketch and music. Here's a taster of the kind of acts we put on last year:

View the full blog post to access video content. In order to see this content you need to have both Javascript enabled and Flash installed. Visit BBC Webwise for full instructions

Masterclasses will take place most afternoons with comedy greats including Ricky Gervais and Warwick Davis discussing the making of their new HBO/BBC Comedy sitcom, Life’s Too Short.

And for the first time thanks to our colleagues in BBC Learning we'll be running a series of Q&A sessions, comedy writing and performance workshops under the banner of The Comedy School. There'll even be the chance to show us your funny in BBC Three's "Funny in 15 Seconds" video booth with the chance to get your video seen on bbc.co.uk/three and bbc.co.uk/comedy.

There'll be loads more activity across these two weeks and you will find out about it on the blog here or by following us @bbccomedy on Twitter or liking us at www.facebook.com/bbccomedy.

If you want to take part in any of our events or be in the audience for any of our shows, click here to apply for tickets.