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