Merge commit 'flameeyes/master'