Merge remote-tracking branch 'shadmar/fishhoop'