merged with master.
merged to wheezy branch