Merge branch 'mika/wheezy_release'