diff --git a/CHANGELOG.md b/CHANGELOG.md
index a65fb195..ee49675a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # OctoPrint Changelog
 
-## 1.2.12 (2016-06-08)
+## 1.2.12 (2016-06-09)
 
 ### Improvements
 
@@ -20,6 +20,7 @@
   * [#1344](https://github.com/foosel/OctoPrint/issues/1344): `ProgressPlugin`s now get also notified about a progress of 0%.
   * [#1357](https://github.com/foosel/OctoPrint/issues/1357): Fixed wrongly named method call on editing access control options for a user, causing that to not work properly.
   * [#1361](https://github.com/foosel/OctoPrint/issues/1361): Properly reload profile list for currently selected slicer in the slicing dialog on change of profiles.
+  * [#1364](https://github.com/foosel/OctoPrint/issues/1364): Fixed a race condition that could cause the UI to not initialize correctly due to 401 errors, leaving it in an unusable state until a reload.
   * Fixed concurrent message pushing to the frontend being able to break push messages for the session by forcing synchronization of SockJS message sending.
   * Do not require admin rights for connecting/disconnecting, like it was in 1.1.x (note that this is supposed to become configurable behaviour once [#1110](https://github.com/foosel/OctoPrint/issues/1110) gets implemented)
 
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 2ece77e2..23984c22 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -302,6 +302,11 @@ There are three main branches in OctoPrint:
     the scheme `x.y.z` (e.g. `1.2.9`) or - if it's absolutely necessary to
     add a commit after release to this branch - `x.y.z.post<commits since x.y.z>`
     (e.g. `1.2.9.post1`).
+  * `prerelease`: This branch is only used during the short period where a
+    future release has "graduated" from the `maintenance` branch and is already
+    tagged, but still marked on Github as a pre-release. This is mostly used for
+    update testing just before new releases. Version number follows the scheme
+    `x.y.z` (e.g. `1.2.9`), just like the `master` branch.
   * `maintenance`: Improvements and fixes of the current release that make up
     the next release go here. More or less continously updated. You can consider
     this a preview of the next release version. It should be very stable at all
@@ -329,6 +334,9 @@ Those usually have one of the following prefixes:
     `maintenance` and `devel` branches.
   * `dev/...` or `feature/...`: New functionality under development that is to be merged
     into the `devel` branch.
+  * `rc`: A branch similar in nature to the `prerelease` branch, only that it will be
+    used to provide current release candidates of the next stable version to be derived
+    from the `devel` branch.
 
 There is also the `gh-pages` branch, which holds OctoPrint's web page, and a couple of
 older development branches that are slowly being migrated or deleted.
@@ -367,6 +375,7 @@ the local version identifier to allow for an exact determination of the active c
   * 2016-02-16: Added requirement to add information from template to existing
     tickets as well, explained issue with "me too" red herrings.
   * 2016-03-14: Some more requirements for PRs, and a PR template.
+  * 2016-06-08: New `prerelease` and `rc` branches explained.
 
 ## Footnotes
   * [1] - If you are wondering why, the problem is that anything that you add