Sync'd branch releases/aurora with upstream @ Tue Oct  7 14:32:36 PDT 2014