merge master+wheezy
