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