LIB: Fix a segfault caused by incrementing an iterrator that was invalidated

Ticket #569
Merge branch 'integration' of ssh://helios/home/git/repositories/Nova into integration