[JOSHUA-332] Merge 7 branch into master

• Type: Task
• Status: Resolved
• Priority: Major
• Resolution: Won't Fix
• Fix Version/s: 7
• Component/s: core
• Assignee: Tommaso Teofili
• Reporter: Tommaso Teofili
• Created: 27/Sep/17 11:33
• Updated: 15/May/18 13:13
• Resolved: 15/May/18 13:13

Description

As discussed on the mailing list, let's branch master into a 6x branch and merge branch 7 into master in order to keep developing on top of the latest in the main branch.