Merge branch 'master' into release

diff --cc doc/manual.asciidoc
Simple merge

diff --cc src/version.cc
index 45fb040,18fa96a..07167fe
--- 1/src/version.cc
--- 2/src/version.cc
+++ b/src/version.cc
@@@ -18,7 -18,7 +18,7 @@@
  
  #include "util.h"
  
- const char* kNinjaVersion = "1.2.0";
 -const char* kNinjaVersion = "1.3.0.git";
++const char* kNinjaVersion = "1.3.0";
  
  void ParseVersion(const string& version, int* major, int* minor) {
    size_t end = version.find('.');