Merge development into master

@traversaro