merge master into dev
authorHakim El Hattab <hakim@squarespace.com>
Thu, 8 Aug 2013 17:34:24 +0000 (13:34 -0400)
committerHakim El Hattab <hakim@squarespace.com>
Thu, 8 Aug 2013 17:34:24 +0000 (13:34 -0400)

Trivial merge