Commit ddf9d7d4550927b39faddcde0c2b98b5001226b0

Edward Thomson 2014-12-18T21:12:05

Merge branch 'hf/master_patch'