Merge branch 'master' into MODULES-1014/add-noop-mode
authorPeter Souter <p.morsou@gmail.com>
Fri, 13 Jun 2014 18:09:08 +0000 (19:09 +0100)
committerPeter Souter <p.morsou@gmail.com>
Fri, 13 Jun 2014 18:09:08 +0000 (19:09 +0100)

Trivial merge