Sync'd branch integration/b2g-inbound with upstream @ Sun Oct  5 17:13:50 PDT 2014