Sync'd branch integration/b2g-inbound with upstream @ Sun Oct  5 20:38:41 PDT 2014