Merge branch 'master' into devel
Conflicts: configure.ac
Authored by: waker 2012-10-25
Parent(s): [0ba394][47abc8]
Child(ren): [7da188]