Merge remote-tracking branch 'origin/master' into soc-2014-cycles soc-2014-cycles
authorThomas Dinges <blender@dingto.org>
Tue, 5 Aug 2014 22:45:13 +0000 (00:45 +0200)
committerThomas Dinges <blender@dingto.org>
Tue, 5 Aug 2014 22:45:13 +0000 (00:45 +0200)

Trivial merge