Merge remote-tracking branch 'upstream/development' into development
authorjdeveloper <jdeveloper.inxenio@gmail.com>
Wed, 15 Oct 2014 09:06:16 +0000 (11:06 +0200)
committerjdeveloper <jdeveloper.inxenio@gmail.com>
Wed, 15 Oct 2014 09:06:16 +0000 (11:06 +0200)

Trivial merge