1e8063a7

By: ValentinHirschi <valentin.hirschi@gmail.com>

Merge commit '30fb0f28c' into ninjars-combined