Sync'd branch integration/b2g-inbound with upstream @ Sat Oct  4 16:22:31 PDT 2014