merge release 0.3.25 (based on 0.3.24-34-g998bca1)
merge release 0.3.25 (based on 0.3.24-34-g998bca1)

1950195/mojito,ooskapenaar/mojito,yahoo/mojito,jeffblack360/mojito,jeffblack360/mojito,1950195/mojito,ooskapenaar/mojito,jeffblack360/mojito,ooskapenaar/mojito,yahoo/mojito,ooskapenaar/mojito,yahoo/mojito,1950195/mojito,jeffblack360/mojito