Sun Dec  8 14:41:11 CST 2013
Merge branch 'hotfix/able-to-trigger-rebuild-assets'