Imported Upstream version 2014.1.a35.g5aaf7c5
Merge tag 'upstream/2014.1.a35.g5aaf7c5'

Upstream version 2014.1.a35.g5aaf7c5
Packaging of git snapshot 2014.1.a35.g5aaf7c5