Sync'd branch integration/b2g-inbound with upstream @ Sat Oct  4 13:28:43 PDT 2014