Dead lock
Gallery
Merge origin/master