Berlin 2014: +1 proposal (Oliver White).
Merge pull request #1113 from jbraeuer/master

Berlin 2014: +1 proposal (Oliver White).