Merging changes for M2

Merging changes for M2 on December 1, 2014