Automatic merge of X1.3.1-348-g94ca26345 and 6 pull requests
-
Pull request #79 at 7d9f14be8: Update version calculation for new unstable versions
-
Pull request #392 at 0b686cfaa: Blueprint https://blueprints.launchpad.net/or/+spec/trainset-elevator Trainset elevator
-
Pull request #396 at 962aeca00: Fix issues with adhesion resume
-
Pull request #399 at 85e6ad07b: Power supply package
-
Pull request #400 at 1b7b519d0: added contribute > team-policies webpage
-
Pull request #401 at a6fbf2536: refactor(docs): New location for GitHub-related files