diff --git a/CHANGELOG.md b/CHANGELOG.md
index caaae387..ee674453 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,26 @@
 ## Parse PHP SDK Changelog
 
 ### master
-[Full Changelog](https://github.com/parse-community/parse-php-sdk/compare/1.4.0...master)
+[Full Changelog](https://github.com/parse-community/parse-php-sdk/compare/1.5.0...master)
+
+### 1.5.0
+[See the diff between 1.4.0 and 1.5.0](https://github.com/parse-community/parse-php-sdk/compare/1.4.0...1.5.0)
+
+- Avoid session fixation by regenerating session id on user promotion (#414)
+- Enable login with POST (#430)
+- Properly handle null query response (#425)
+- Fix queries equalTo with null values (#406)
+- Add sort option to GeoQueries (#424)
+- Add encode option to ParseQuery:find (#423)
+- Add batchSize to saveAll / destroyAll (#422)
+- Add includeAll to query (#421)
+- Add And / Nor query (#419)
+- Add 'containedBy' query (#418)
+- Add 'containsAllStartingWith' query (#417)
+- Remove anonymous auth data from User table when user registers.  Match other SDK behavior (#417)
+- Fix bug in mime type guessing due to case mishandling (#399)
+- Use registered subclass when creating a ParseUser (#394)
+
 
 ### 1.4.0
 [See the diff between 1.3.0 and 1.4.0](https://github.com/parse-community/parse-php-sdk/compare/1.3.0...1.4.0)
diff --git a/LICENSE b/LICENSE
index db90d09a..f11b38ba 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,21 +1,34 @@
-Copyright (c) 2014, Parse, LLC. All rights reserved.
+BSD License
 
-You are hereby granted a non-exclusive, worldwide, royalty-free license to use,
-copy, modify, and distribute this software in source code or binary form for use
-in connection with the web services and APIs provided by Parse.
+For Parse Server software
 
-As with any software that integrates with the Parse platform, your use of
-this software is subject to the Parse Terms of Service at: https://www.parse.com/about/terms
-This copyright notice shall be included in all copies or substantial portions of the 
-software.
+Copyright (c) 2015-present, Parse, LLC. All rights reserved.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+ * Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+
+ * 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 Parse 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
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 -----
 
-As of April 5, 2017, Parse, LLC has transferred this code to the parse-community organization, and will no longer be contributing to or distributing this code. 
+As of April 5, 2017, Parse, LLC has transferred this code to the parse-community organization, and will no longer be contributing to or distributing this code.
diff --git a/README.md b/README.md
index e6c32506..c8283e5f 100644
--- a/README.md
+++ b/README.md
@@ -9,6 +9,7 @@ from your PHP app or script.  Designed to work with the self-hosted Parse Server
 For more information on Parse and its features, see [the website](http://parseplatform.org), [the PHP guide](https://docs.parseplatform.org/php/guide/) or [API Reference](http://parseplatform.org/parse-php-sdk/namespaces/Parse.html).
 
 Please note that this documentation contains the latest changes that may as of yet be unreleased. To see the README for your release please use the list below.
+- [1.5.0 README](https://github.com/parse-community/parse-php-sdk/blob/1.5.0/README.md)
 - [1.4.0 README](https://github.com/parse-community/parse-php-sdk/blob/1.4.0/README.md)
 - [1.3.0 README](https://github.com/parse-community/parse-php-sdk/blob/1.3.0/README.md)
 
@@ -65,7 +66,7 @@ Note that the Parse PHP SDK requires PHP 5.4 or newer. It can also run on HHVM (
 ```json
 {
     "require": {
-        "parse/php-sdk" : "1.4.*"
+        "parse/php-sdk" : "1.5.*"
     }
 }
 ```
diff --git a/composer.json b/composer.json
index 7f8ec5d2..8f80cf87 100644
--- a/composer.json
+++ b/composer.json
@@ -2,6 +2,7 @@
     "name": "parse/php-sdk",
     "description": "Parse PHP SDK",
     "keywords": ["parse", "sdk"],
+    "license": "BSD-3-Clause",
     "type": "library",
     "homepage": "https://github.com/parse-community/parse-php-sdk",
     "authors": [
diff --git a/package.json b/package.json
index c487b493..e879094a 100644
--- a/package.json
+++ b/package.json
@@ -15,7 +15,7 @@
     "type": "git",
     "url": "git+https://github.com/parse-community/parse-php-sdk"
   },
-  "license": "SEE LICENSE IN LICENSE",
+  "license": "BSD-3-Clause",
   "homepage": "https://github.com/montymxb/parse-server-test#readme",
   "dependencies": {
     "parse-server-test": "github:dplewis/parse-server-test#master",
diff --git a/src/Parse/ParseClient.php b/src/Parse/ParseClient.php
index 45b58b5d..aedbe06b 100755
--- a/src/Parse/ParseClient.php
+++ b/src/Parse/ParseClient.php
@@ -111,11 +111,11 @@ final class ParseClient
     private static $caFile;
 
     /**
-     * Constant for version string to include with requests. Currently 1.4.0.
+     * Constant for version string to include with requests. Currently 1.5.0.
      *
      * @var string
      */
-    const VERSION_STRING = 'php1.4.0';
+    const VERSION_STRING = 'php1.5.0';
 
     /**
      * Parse\Client::initialize, must be called before using Parse features.