Merge branch 'oracle-fixes'
Dagfinn Ilmari Mannsåker [Sat, 18 Oct 2014 14:49:54 +0000 (15:49 +0100)]

Trivial merge