Commit eac938d96eccb39c30ce94adf7f8cdc06df098fe

Edward Thomson 2013-12-02T14:10:04

Bare naked merge and rebase