Finishing up a rebase to master (as of 20141030)
Fixing the rebase. Should now be identical to upstream