Merge Luna changes.
Upversion to 1.2.0 for Mars
42 files changed