Merge branch 'master' into bmx6_testing
authorPau Escrich <p4u@dabax.net>
Fri, 10 Jan 2014 16:39:00 +0000 (17:39 +0100)
committerPau Escrich <p4u@dabax.net>
Fri, 10 Jan 2014 16:39:00 +0000 (17:39 +0100)

Trivial merge