upstream/0.3.4

Boud Roukema

@boud-guest

72e1e807 · Merge remote-tracking branch 'bitbucket/master' into upstream · Jan 06, 2017

Unverified

upstream/0.3.4