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