Merge branch '2.1' into 2.2

.travis.yml

@@ -12,8 +12,6 @@ env:
     - DB=MYSQL CORE_RELEASE=3.1
 
 matrix:
-  allow_failures:
-    - php: hhvm-nightly
   include:
     - php: 5.6
       env: DB=MYSQL
@@ -23,9 +21,6 @@ matrix:
       env: DB=MYSQL
     - php: 5.3
       env: DB=MYSQL
-    - php: hhvm
-      env: DB=MYSQL
-      before_install:
 
 
 before_script:

code/extensions/BlogMemberExtension.php

@@ -35,6 +35,10 @@ class BlogMemberExtension extends DataExtension {
 	public function onBeforeWrite() {
 		$count = 1;
 
+		if ($this->owner->URLSegment && !$this->owner->isChanged('FirstName') && !$this->owner->isChanged('Surname')) {
+			return;
+		}
+
 		$this->owner->URLSegment = $this->generateURLSegment();
 
 		while(!$this->validURLSegment()) {