Merging
Merge remote-tracking branch 'origin/master'
Shortified war name
Minor changes - just a merge exercise ;)