Imported Upstream version 1.2
Merge tag 'upstream/1.2'

Upstream version 1.2

# gpg: Signature made Mon 24 Nov 2014 08:20:55 CET using RSA key ID EF5E6BEA
# gpg: Good signature from "Florian Preinstorfer <fp@xell.at>"
# gpg:                 aka "Florian Preinstorfer <florian.preinstorfer@xell.at>"
Update patches.
Release 1.2-1.