Merge remote branch 'upstream/master' into bugfixes
authorHans Dedecker <hans.dedecker@technicolor.com>
Thu, 23 Jan 2014 09:44:22 +0000 (10:44 +0100)
committerHans Dedecker <hans.dedecker@technicolor.com>
Thu, 23 Jan 2014 09:44:22 +0000 (10:44 +0100)

Trivial merge