Sync'd branch releases/aurora with upstream @ Tue Oct 21 13:07:39 PDT 2014