Merge remote-tracking branch 'pipping/master'

Conflicts:
	examples/api/scatter_piecharts.py

White space induced conflicts

Conflicts:
	examples/api/scatter_piecharts.py

Author: tacaswell

examples/api/scatter_piecharts.py

@@ -8,7 +8,7 @@
 import matplotlib.pyplot as plt
 
 # first define the ratios
-r1 = 0.2      # 20%
+r1 = 0.2       # 20%
 r2 = r1 + 0.4  # 40%
 
 # define some sizes of the scatter marker
@@ -21,7 +21,6 @@
 x = [0] + np.cos(np.linspace(0, 2*math.pi*r1, 10)).tolist()
 y = [0] + np.sin(np.linspace(0, 2*math.pi*r1, 10)).tolist()
 
-
 xy1 = list(zip(x, y))
 s1 = max(max(x), max(y))