Sync'd branch releases/aurora with upstream @ Tue Oct 21 18:43:44 PDT 2014