Merge version 2.0.2-2+rpi1 and 2.0.3-1 to produce 2.0.3-1+rpi1

diff --cc debian/changelog
index 48f2d29a4a6727647701b0c1426fca996dfc6e54,3479e82d9d245b1121cd2410a283b23161e43338..5d401c7c44d6dbd4eaeefdbb5ff18ff1d64cb250
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,11 +1,18 @@@
- python-astropy (2.0.2-2+rpi1) buster-staging; urgency=medium
++python-astropy (2.0.3-1+rpi1) buster-staging; urgency=medium
 +
 +  [changes brought forward from 2.0.2-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Fri, 03 Nov 2017 23:08:32 +0000]
 +  * Disable testsuite.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Thu, 14 Dec 2017 04:43:36 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Tue, 02 Jan 2018 06:16:33 +0000
++
+ python-astropy (2.0.3-1) unstable; urgency=low
+ 
+   * New upstream version 2.0.3
+   * Rediff patches
+   * Remove http proxy from d/rules to allow localhost connections
+   * Use the packaged MathJax
+ 
+  -- Ole Streicher <olebole@debian.org>  Tue, 19 Dec 2017 11:35:47 +0100
  
  python-astropy (2.0.2-2) unstable; urgency=medium
  

diff --cc debian/rules
Simple merge