Merge branch 'develop' into 'master'

fix license file

See merge request !5

LICENSE.md

-Copyright (C) 2010-2018 Max-Planck-Society
+Copyright (C) 2010-2019 Max-Planck-Society
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
@@ -9,8 +9,8 @@ are permitted provided that the following conditions are met:
 * Redistributions in binary form must reproduce the above copyright notice, this
   list of conditions and the following disclaimer in the documentation and/or
   other materials provided with the distribution.
-* Neither the name of the Astropy Team nor the names of its contributors may be
-  used to endorse or promote products derived from this software without
+* Neither the name of the copyright holder nor the names of its contributors may
+  be used to endorse or promote products derived from this software without
   specific prior written permission.
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND