Avoid pop from empty list.
Merge branch 'master' into dev