Stable v3.3.4 Update (see readme for changelog)
Merge commit 'ab24b4c86cb1c86fbece57f376dd0614f0515895'