Merge remote-tracking branch 'origin/1.0.x' into 2.0.x

Author: SethTisue

.travis.yml

@@ -15,5 +15,5 @@ jdk: oraclejdk8
 
 notifications:
   email:
-    - adriaan.moors@typesafe.com
+    - adriaan.moors@lightbend.com
     - [email protected]

LICENSE.md

@@ -1,6 +1,6 @@
 Copyright (c) 2002-2013 EPFL
 
-Copyright (c) 2011-2013 Typesafe, Inc.
+Copyright (c) 2011-2013 Lightbend, Inc.
 
 All rights reserved.
 
@@ -26,4 +26,4 @@ PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
 PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
 LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
 NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.