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