Squashed 'util/' changes from 48630c4..86f57bd

86f57bd cython 0.20 fixes a typo
79429b1 add trivial line_profiled def if line_profiler not available

git-subtree-dir: util
git-subtree-split: 86f57bd0c27dd7855fee1dd2f655b7ae3e1d484f
Merge commit 'ec64811a3ff5bcc3b3939dfd135d554e1abcac0c'

Conflicts:
	util/profiling.py