Merge branch 'master' into wip-derekjw

Conflicts:
	akka-actor-tests/src/test/scala/akka/misc/SchedulerSpec.scala
	akka-actor/src/main/scala/akka/actor/ActorRef.scala
	akka-cluster/src/main/scala/akka/cluster/ClusterActorRef.scala
	akka-tutorials/akka-tutorial-second/src/main/scala/Pi.scala
	project/AkkaBuild.scala

akka-actor/src/main/scala/akka/dispatch/MessageHandling.scala

@@ -34,8 +34,7 @@ final case class FutureInvocation[T](future: Promise[T], function: () ⇒ T, cle
       case e ⇒
         EventHandler.error(e, this, e.getMessage)
         Left(e)
-    }
-    finally {
+    } finally {
       cleanup()
     })
   }