Sync'd branch releases/aurora with upstream @ Mon Sep 29 16:56:34 PDT 2014