removed executable bit on test file (nose doesn't collect tests from executables)
Merge branch 'dev' into merger
Merge remote-tracking branch 'upstream/package-ubuntu1204' into package-ubuntu1204