From fe6a8cede7607fdfd44b0b6f39c7464b70c21f3c Mon Sep 17 00:00:00 2001
From: Eric Soroos <eric-github@soroos.net>
Date: Sat, 11 Oct 2014 09:14:39 -0700
Subject: [PATCH] Merge branch 'master', remote-tracking branch 'origin'