Merge remote-tracking branch 'origin/selective-sync-big-folder' into 2.3
authorMarkus Goetz <markus@woboq.com>
Wed, 25 Jan 2017 18:45:20 +0000 (19:45 +0100)
committerMarkus Goetz <markus@woboq.com>
Wed, 25 Jan 2017 18:45:20 +0000 (19:45 +0100)

Trivial merge