Merge tag '1.0.4' into develop

version 1.0.4
9 jobs for develop in 11 minutes and 30 seconds (queued for 1 second)
Status Job ID Name Coverage
  Build
passed #4686
mac
build:osx

00:02:03

passed #4685
ubuntu14.04
build:trusty

00:02:35

passed #4687
windows
build:windows

00:05:23

 
  Test
passed #4689
mac
test:osx

00:01:16

passed #4688
ubuntu14.04
test:trusty

00:02:09

passed #4690
windows
test:windows

00:03:05

 
  Deploy
passed #4692
mac
deploy:osx

00:01:58

passed #4691
ubuntu14.04
deploy:trusty

00:01:44

passed #4693
windows
deploy:windows

00:02:58