20141211am
CONFLICT marge
Merge branch 'mtanahashi-20141211am' into 20141211am