Merge tag 'upstream/2.1.0+git20141201.db59ff3'
Bumped Standard-Version to 3.9.6 (no changes required)
New package release