Merge remote-tracking branch 'gerrit/stable' into release

Conflicts:
	qtwebkit-examples

Change-Id: Ifa8735dd8f7ddf3aa74474c983327b94ea2737c5

.commit-template

@@ -4,10 +4,10 @@
 # ==[ Details: Describe what changed and explain why it changed ]======|
 
 
-# ==[ Footers: Uncomment and edit where applicable ]===================|
-#
 # Change log entry (see below for instructions).
 #[ChangeLog][][]
+
+# ==[ Footers: Uncomment and edit where applicable ]===================|
 #
 # One task per entry. Remember space after colon.
 #Task-number: 
@@ -22,7 +22,8 @@
 # Change log entry: If this commit adds a significant feature, fixes an
 # issue or contains a behavior change that is relevant to others,
 # add a change log entry. It can be multiple lines long and ends with an
-# empty newline.
+# empty newline. Try to integrate it into the flow of the commit message
+# to avoid redundancy.
 # Use the module name to indicate the area of the change e.g. [QtCore].
 # Optionally specify a class or subtopic [QtNetwork][QSslSocket].
 # Other common tags are: [General], [Important Behavior Changes],