This merges v3.3.0 at beta 2 stage. Conflicts related to the os x -> macOS rename were corrected manually.