Merge dev (20141215-1)

Merge dev (20141215-1).