Merging latest changes from itseez:master