Commit b23ccd09 authored Jan 29, 2016 by jay

Merge remote-tracking branch 'origin/subpixel' into subpixel

# Conflicts:
#	.travis.yml

There are no changes