Just merged 6 weeks of development from one branch to master in Git. Stats: 372 files changed, 345668 insertions(+), 4862 deletions(-)