THIS IS WHY WE CAN'T HAVE NICE THINGS
YOU CAN (NOT) HAVE NICE THINGS
Merge branch 'master' into testing_log