Mergeing OctoPrint version 1.3.4 from foosel/master

Author: Andy Werner

.github/ISSUE_TEMPLATE.md

@@ -1,31 +1,34 @@
 READ THE FOLLOWING FIRST:
 
 If not already done, please read the "guidelines for contributing"
-that are linked ^-- just up there in the big yellow box. Also read
-the FAQ: https://github.com/foosel/OctoPrint/wiki/FAQ.
+aka the Contribution Guidelines that are linked ^-- just up there
+in the big yellow box.
+
+Also read the FAQ: https://github.com/foosel/OctoPrint/wiki/FAQ.
 
 This is a bug and feature tracker, please only use it to report bugs
 or request features within OctoPrint (not OctoPi, not any OctoPrint
 plugins and not unofficial OctoPrint versions).
 
-Do not seek support here ("I need help with ..."), that belongs on
-the mailing list or the G+ community (both linked in the "guidelines
-for contributing" linked above, read it!), NOT here.
+Do not seek support here ("I need help with ...", "I have a
+question ..."), that belongs on the mailing list or the G+ community
+(both linked in the "guidelines for contributing" linked above, read
+them!), NOT here.
 
-Mark requests with a "[Request]" prefix in the title please. Fully fill
-out the bug reporting template for bug reports (if you don't know where
-to find some information - it's all described in the contribution
-guidelines linked up there in the big yellow box).
+Mark requests with a "[Request]" prefix in the title please. For bug
+reports fully fill out the bug reporting template (if you don't know
+where to find some information - it's all described in the Contribution
+Guidelines linked up there in the big yellow box).
 
-When reporting a bug do NOT delete any lines from the template but
+When reporting a bug do NOT delete ANY lines from the template but
 those enclosed in [ and ] - and those please DO delete, they are
 only provided for your information and removing them makes your
 ticket more readable :)
 
-Make sure any bug you want to repor tis still present with the CURRENT
+Make sure any bug you want to report is still present with the CURRENT
 OctoPrint version and that it does not vanish when you start OctoPrint
-in safe mode - how to do that is also explained in the contribution
-guidelines linked up there in the big yellow box.
+in safe mode - how to do that is also explained in the Contribution
+Guidelines linked up there in the big yellow box.
 
 Thank you!
 
@@ -37,53 +40,68 @@ by heart ;))
 
 #### What were you doing?
 
-[Please describe the steps to reproduce your issue. Be as specific as
-possible here. The maintainers will need to reproduce your issue in
-order to fix it and that is not possible if they don't know what you
-did to get it to happen in the first place.
+[Please be as specific as possible here. The maintainers will need to
+reproduce your issue in order to fix it and that is not possible if they
+don't know what you did to get it to happen in the first place.
+
+Ideally provide exact steps to follow in order to reproduce your problem:
+
+1. ...
+2. ...
+3. ...
 
 If you encountered a problem with specific files of any sorts, make sure
 to also include a link to a file with which to reproduce the problem.]
 
-#### What did you expect to happen and what happened instead?
+#### What did you expect to happen?
+
+#### What happened instead?
+
+#### Did the same happen when running OctoPrint in safe mode?
+
+[Try to reproduce your problem in safe mode. You can find information
+on how to enable safe mode in the Contribution Guidelines.]
 
 #### Branch & Commit or Version of OctoPrint
 
 [Can be found in the lower left corner of the web interface. ALWAYS INCLUDE.]
 
 #### Operating System running OctoPrint
 
-[OctoPi, Linux, Windows, MacOS, something else? With version please.]
+[OctoPi, Linux, Windows, MacOS, something else? With version please.
+OctoPi's version can be found in /etc/octopi_version]
 
 #### Printer model & used firmware incl. version
 
 [If applicable, always include if unsure.]
 
 #### Browser and Version of Browser, Operating System running Browser
 
-[If applicable, always include if unsure or reporting UI issues.]
+[If applicable, always include if unsure.]
 
 #### Link to octoprint.log
 
-[On gist.github.com or pastebin.com. ALWAYS INCLUDE and never truncate.]
+[On gist.github.com or pastebin.com. ALWAYS INCLUDE and never truncate.
+The Contribution Guidelines tell you where to find that.]
 
 #### Link to contents of terminal tab or serial.log
 
 [On gist.github.com or pastebin.com. If applicable, always include if unsure or
-reporting any kind of communication issues between OctoPrint and your printer.
-Never truncate.
+reporting communication issues. Never truncate.
 
 serial.log is usually not written due to performance reasons and must be
 enabled explicitly. Provide at the very least the FULL contents of your
 terminal tab at the time of the bug occurrence, even if you do not have
-a serial.log.]
+a serial.log (which the Contribution Guidelines tell you where to find).]
 
 #### Link to contents of Javascript console in the browser
 
 [On gist.github.com or pastebin.com or alternatively a screenshot. If applicable -
-always include if unsure or reporting UI issues.]
+always include if unsure or reporting UI issues.
+
+The Contribution Guidelines tell you where to find that.]
 
-#### Screenshot(s) or video(s) showing the problem:
+#### Screenshot(s)/video(s) showing the problem:
 
 [If applicable. Always include if unsure or reporting UI issues.]
 

.versioneer-lookup

@@ -18,11 +18,14 @@ prerelease
 HEAD
 \(detached.*
 
-# maintenance is currently the branch for preparation of maintenance release 1.3.2
+# maintenance is currently the branch for preparation of maintenance release 1.3.3
 # so are any fix/... and improve/... branches
-maintenance 1.3.2 6393de8c7d42a8bbddcab7cdbb6530ea88a8c82d pep440-dev
-fix/.* 1.3.2 6393de8c7d42a8bbddcab7cdbb6530ea88a8c82d pep440-dev
-improve/.* 1.3.2 6393de8c7d42a8bbddcab7cdbb6530ea88a8c82d pep440-dev
+maintenance 1.3.3 0a69dbeddb301d5a32827a3f0d561f875df24234 pep440-dev
+fix/.* 1.3.3 0a69dbeddb301d5a32827a3f0d561f875df24234 pep440-dev
+improve/.* 1.3.3 0a69dbeddb301d5a32827a3f0d561f875df24234 pep440-dev
+
+# staging/maintenance is currently the branch for preparation of 1.3.3rc4 (if we'll need that)
+staging/maintenance 1.3.3rc4 ce1541e956778b732458599a21f38b6783a0c2ec pep440-dev
 
 # every other branch is a development branch and thus gets resolved to 1.4.0-dev for now
 .* 1.4.0 7f5d03d0549bcbd26f40e7e4a3297ea5204fb1cc pep440-dev

AUTHORS.md

@@ -79,6 +79,7 @@ date of first contribution):
   * [Greg Hulands](https://github.com/ghulands)
   * [Andreas Werner](https://github.com/gallore)
   * [Shawn Bruce](https://github.com/kantlivelong)
+  * [Claudiu Ceia] (https://github.com/ClaudiuCeia)
 
 OctoPrint started off as a fork of [Cura](https://github.com/daid/Cura) by
 [Daid Braam](https://github.com/daid). Parts of its communication layer and