comitted from  nexus7 2013.12.11 02:30