robey Merge branch 'unresolved'

Latest commit 3db99f2

Nov 11, 2016