Merge remote-tracking branch 'gekitsuu/master' (closes PR #1913)