Merged from trunk, mostly due to the introduction of the style attribute for all AbstractInput items.
All other changes are supposed to be cosmetic.
Authored by: keess 2015-10-15
Parent: [r2804]
Child: [r2806]