Sync'd branch integration/b2g-inbound with upstream @ Mon Sep 15 21:03:40 PDT 2014