Merge "Fixed bug in model3d-view control" into devel/master