Merge branch 'Glassices' into develop

Conflicts:
timeshaftitem.cpp