Merge branch 'master' into bmx6_testing
authorPau Escrich <[email protected]>
Fri, 10 Jan 2014 16:39:00 +0000 (17:39 +0100)
committerPau Escrich <[email protected]>
Fri, 10 Jan 2014 16:39:00 +0000 (17:39 +0100)

Trivial merge