Commit f3967c73007c7b2ebbda0142bfc9971ffced122f

Authored by Brendan Klare
2 parents a00cdb50 911ac5ef

Rebasing with master (?)