From 10465066ee32bcd94f7d31f72924fb09ebfdd215 Mon Sep 17 00:00:00 2001
From: Lorin Beer <lorin.beer@nitobi.com>
Date: Thu, 28 Jun 2012 15:37:11 -0700
Subject: [PATCH] Merge branches 'master' and 'dev'