Sync'd branch releases/aurora with upstream @ Mon Sep 22 12:38:37 PDT 2014