Merge "personal/q3k/annoyatron: init"