2014-11-09 update
Merge branch 'chong' into dev