Sun Dec  8 14:44:51 CST 2013
Merge branch 'hotfix/able-to-trigger-rebuild-assets2'