Wed Sep 24 19:04:58     2014
Merge branch 'tmp' into dev