Merge branch 'bugfix-macos_finder_quit_thread' into develop

9 jobs from develop in 13 minutes and 53 seconds (queued for 1 second)
Status Job ID Name Coverage
  Build
passed #4718
mac
build:osx

00:02:00

passed #4717
ubuntu14.04
build:trusty

00:01:55

passed #4719
windows
build:windows

00:03:39

 
  Test
passed #4721
mac
test:osx

00:01:15

passed #4720
ubuntu14.04
test:trusty

00:01:55

passed #4722
windows
test:windows

00:02:59

 
  Deploy
passed #4724
mac
deploy:osx

00:02:35

passed #4723
ubuntu14.04
deploy:trusty

00:00:46

passed #4725
windows
deploy:windows

00:02:41