Merge branch 'djnym-master'