Merge branch 'feat/defer_requests' into develop
authorRuben Pollan <meskio@sindominio.net>
Thu, 4 Feb 2016 16:33:50 +0000 (17:33 +0100)
committerRuben Pollan <meskio@sindominio.net>
Thu, 4 Feb 2016 16:33:50 +0000 (17:33 +0100)

Trivial merge