Incremented app version number (2.1)
Triage
Triage 2
Merge remote-tracking branch 'upstream/2.x' into 2.x