Issue #15812: Merge from 3.6

diff --cc Lib/test/test_inspect.py
Simple merge

diff --cc Misc/NEWS
index 6152a3fc65fecf44eaf94172fcbda41cb5d59367,c8eacf1ce3fa44ba3de614a95b55dbb99f057d38..3d4a1861bdddea11585f98f8ac262fc803c22ce3
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -208,9 -40,9 +208,12 @@@ Core and Builtin
  Library
  -------
  
+ - Issue #15812: inspect.getframeinfo() now correctly shows the first line of
+   a context.  Patch by Sam Breese.
+ 
 +- Issue #28985: Update authorizer constants in sqlite3 module.
 +  Patch by Dingyuan Wang.
 +
  - Issue #29094: Offsets in a ZIP file created with extern file object and modes
    "w" and "x" now are relative to the start of the file.