Revision 2462d60b1e09f6ee4e6f38a6c2506ae7b4cb696a

Committed on 18/03/2014 2:19 pm by Bertrand Dunogier <bd@ez.no> [GitHub Diff]

Merge remote-tracking branch 'origin/master'