Merge with upstrea/development
authorjdeveloper <jdeveloper.inxenio@gmail.com>
Wed, 16 Jul 2014 14:21:39 +0000 (16:21 +0200)
committerjdeveloper <jdeveloper.inxenio@gmail.com>
Wed, 16 Jul 2014 14:21:39 +0000 (16:21 +0200)

Trivial merge