Merge remote-tracking branch 'origin/develop' into develop
authorKenneth Reitz <kreitz@Kenneths-MacBook-Pro.local>
Wed, 21 Nov 2012 22:59:11 +0000 (17:59 -0500)
committerKenneth Reitz <kreitz@Kenneths-MacBook-Pro.local>
Wed, 21 Nov 2012 22:59:11 +0000 (17:59 -0500)

Trivial merge