version-2014_12_11
Merge remote-tracking branch 'MCAPI_SRC/master'