From 17170a2ca7672c6b05282c45f91430a32d8521fc Mon Sep 17 00:00:00 2001
From: Idan Gazit <idan@gazit.me>
Date: Tue, 13 Mar 2012 12:59:33 -0700
Subject: [PATCH] Merge branch 'develop', remote-tracking branch
 'upstream/develop' into develop