diff --git a/dist/changes-1.3.1 b/dist/changes-1.3.1
new file mode 100644
index 00000000000..0fc73623b26
--- /dev/null
+++ b/dist/changes-1.3.1
@@ -0,0 +1,48 @@
+The QtCreator 1.3.1 release is a bug fix release.
+
+Below is a list of relevant changes. You can find a complete list of changes
+within the logs of Qt Creator's sources. Simply check it out from the public git
+repository e.g.,
+
+git clone git://gitorious.org/qt-creator/qt-creator.git
+git log --cherry-pick --pretty=oneline v1.3.0...v1.3.1
+
+General
+   * Updated translations
+
+Editing
+   * Fixed drawing issues when line wrap is enabled
+   * Fixed problem with indentation when auto-indent is turned off
+
+C++ Support
+   * Don't show the refactoring warning message all the time
+   * Insert semicolon when matching enum declarations
+   * Fixed function argument widget text color in dark themes
+   * Fixed that inline implemented methods did not show up in the methods filter
+   * Fixed in-place renaming when text is selected
+   * Fixed autoindent when using tabs instead of spaces
+   * Fixed completion when a typedef symbol is used as class name
+   * Fixed that template argument was marked as "not a type name" when defined as primitive type
+   * Fixed some highlight errors in code using the win32 API
+   * Improved completion of function definition parameter lists to append the 
+     const and volatile qualifiers if required
+
+Project support
+   * Fixed that run configurations were disabled if they had no build step
+
+Debugging
+   * CDB: Fixed disassembler for 64 bit addresses
+   * Fixed finding the file for build issues when mingw32-make is used
+   * Ignore case of file name in breakpoint handling on Windows
+
+Help
+   * Don't switch to Help mode if help side bar is already visible
+
+Platform Specific
+
+Mac
+   * Couldn't set "/usr/bin/qmake-4.6" or "/Developer/Tools/Qt/qmake" for Qt
+
+Symbian Target
+   * Fixed the time stamp of deployed files
+
diff --git a/src/libs/cplusplus/LookupContext.cpp b/src/libs/cplusplus/LookupContext.cpp
index 4e4e360fd77..08b44c96279 100644
--- a/src/libs/cplusplus/LookupContext.cpp
+++ b/src/libs/cplusplus/LookupContext.cpp
@@ -361,8 +361,10 @@ QList<Scope *> LookupContext::visibleScopes(const LookupItem &result) const
 QList<Scope *> LookupContext::visibleScopes(Symbol *symbol) const
 {
     QList<Scope *> scopes;
-    for (Scope *scope = symbol->scope(); scope; scope = scope->enclosingScope())
-        scopes.append(scope);
+    if (symbol) {
+        for (Scope *scope = symbol->scope(); scope; scope = scope->enclosingScope())
+            scopes.append(scope);
+    }
     scopes += visibleScopes();
     scopes = expand(scopes);
     return scopes;
diff --git a/src/libs/cplusplus/NamePrettyPrinter.cpp b/src/libs/cplusplus/NamePrettyPrinter.cpp
index 99274198a2a..d6071ccebc1 100644
--- a/src/libs/cplusplus/NamePrettyPrinter.cpp
+++ b/src/libs/cplusplus/NamePrettyPrinter.cpp
@@ -90,6 +90,8 @@ void NamePrettyPrinter::visit(const TemplateNameId *name)
         else
             _name += arg;
     }
+    if (! _name.isEmpty() && _name.at(_name.length() - 1) == '>')
+        _name += QLatin1Char(' ');
     _name += QLatin1Char('>');
 }
 
diff --git a/src/plugins/designer/formeditorplugin.cpp b/src/plugins/designer/formeditorplugin.cpp
index 43003b4f264..498e8ff39e9 100644
--- a/src/plugins/designer/formeditorplugin.cpp
+++ b/src/plugins/designer/formeditorplugin.cpp
@@ -91,6 +91,18 @@ bool FormEditorPlugin::initialize(const QStringList &arguments, QString *error)
 
     addAutoReleasedObject(new FormEditorFactory);
 
+    // Ensure that loading designer translations is done before FormEditorW is instantiated
+    const QString locale = qApp->property("qtc_locale").toString();
+    if (!locale.isEmpty()) {
+        QTranslator *qtr = new QTranslator(this);
+        const QString &creatorTrPath =
+                Core::ICore::instance()->resourcePath() + QLatin1String("/translations");
+        const QString &qtTrPath = QLibraryInfo::location(QLibraryInfo::TranslationsPath);
+        const QString &trFile = QLatin1String("designer_") + locale;
+        if (qtr->load(trFile, qtTrPath) || qtr->load(trFile, creatorTrPath))
+            qApp->installTranslator(qtr);
+    }
+
     if (qgetenv("KDE_SESSION_VERSION") == QByteArray("4")) {
         // KDE 4, possibly dangerous...
         // KDE 4.2.0 had a nasty bug, which resulted in the File/Open Dialog crashing
@@ -105,17 +117,6 @@ bool FormEditorPlugin::initialize(const QStringList &arguments, QString *error)
         FormEditorW::ensureInitStage(FormEditorW::RegisterPlugins);
     }
 
-    const QString locale = qApp->property("qtc_locale").toString();
-    if (!locale.isEmpty()) {
-        QTranslator *qtr = new QTranslator(this);
-        const QString &creatorTrPath =
-                Core::ICore::instance()->resourcePath() + QLatin1String("/translations");
-        const QString &qtTrPath = QLibraryInfo::location(QLibraryInfo::TranslationsPath);
-        const QString &trFile = QLatin1String("designer_") + locale;
-        if (qtr->load(trFile, qtTrPath) || qtr->load(trFile, creatorTrPath))
-            qApp->installTranslator(qtr);
-    }
-
     error->clear();
     return true;
 }