Fixes #105
Merge branch '105-LSB-Strict-Standards-Bug' into daily