Merge branch 'refactoring_2016' into 'master'

Implements the annotations

See merge request !21
15 jobs for master in 13 minutes and 5 seconds (queued for 4 seconds)
Status Job ID Name Coverage
  Build
passed #40177
conda-linux
build_linux_27

00:01:16

passed #40180
conda-linux
build_linux_34

00:01:13

passed #40182
conda-linux
build_linux_35

00:01:19

passed #40178
conda-macosx
build_macosx_27

00:01:35

passed #40181
conda-macosx
build_macosx_34

00:01:31

passed #40179
conda-macosx
build_macosx_35

00:01:30

 
  Test
passed #40186
conda-linux
test_linux_27

00:04:26

80.0%
passed #40184
conda-linux
test_linux_34

00:06:51

80.0%
passed #40183
conda-linux
test_linux_35

00:08:03

80.0%
passed #40187
conda-macosx
test_macosx_27

00:07:20

80.0%
passed #40185
conda-macosx
test_macosx_34

00:08:05

80.0%
passed #40188
conda-macosx
test_macosx_35

00:07:32

80.0%
 
  Docs
passed #40189
conda-linux
docs_linux_35

00:00:23

 
  Wheels
passed #40190
conda-linux
wheels_linux_27

00:00:28

passed #40191
conda-linux
wheels_linux_35

00:00:27