documented else / finally syntax for try / catch
Merge remote-tracking branch 'upstream/master'