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