Merge dev (20141228-1)

Merge dev branch (20141228-1)