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 Name Job ID Coverage
  Build
passed build_linux_27 #40177
conda-linux

00:01:16

passed build_linux_34 #40180
conda-linux

00:01:13

passed build_linux_35 #40182
conda-linux

00:01:19

passed build_macosx_27 #40178
conda-macosx

00:01:35

passed build_macosx_34 #40181
conda-macosx

00:01:31

passed build_macosx_35 #40179
conda-macosx

00:01:30

 
  Test
passed test_linux_27 #40186
conda-linux

00:04:26

80.0%
passed test_linux_34 #40184
conda-linux

00:06:51

80.0%
passed test_linux_35 #40183
conda-linux

00:08:03

80.0%
passed test_macosx_27 #40187
conda-macosx

00:07:20

80.0%
passed test_macosx_34 #40185
conda-macosx

00:08:05

80.0%
passed test_macosx_35 #40188
conda-macosx

00:07:32

80.0%
 
  Docs
passed docs_linux_35 #40189
conda-linux

00:00:23

 
  Wheels
passed wheels_linux_27 #40190
conda-linux

00:00:28

passed wheels_linux_35 #40191
conda-linux

00:00:27